*** empty log message ***

diff --git a/man/ChangeLog b/man/ChangeLog
index e508cc35d0f0a2dd44626148b1d1d88b9500db8a..14a90826e250ff2f3261ec5b6ec78e8eafd39007 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-18  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * Makefile.in (emacs.dvi): Remove xresmini.texi
+
+       * emacs: Include xresources.texi both for info and dvi.
+
+       * xresources.texi: Merge text from xresmini.texi
+
 2006-11-17  Carsten Dominik  <dominik@science.uva.nl>
 
        * org.texi: Fix typos.